Fixing Night Market